[qemu] Remove unused -timeoffset option.

Signed-off-by: Christian Limpach <Christian.Limpach@xensource.com>

diff --git a/tools/ioemu/hw/mc146818rtc.c b/tools/ioemu/hw/mc146818rtc.c
index 4a9e25cc25c08e80d2647399cafed49326efb938..bad4cbd86481b3088168ba233a33c992ec6086dc 100644 (file)
--- a/tools/ioemu/hw/mc146818rtc.c
+++ b/tools/ioemu/hw/mc146818rtc.c
@@ -178,27 +178,10 @@ static inline int from_bcd(RTCState *s, int a)
     }
 }
 
-static void send_timeoffset_msg(time_t delta)
-{
-
-/* This routine is used to inform another entity that the
-   base time offset has changed. For instance, if you
-   were using xenstore, you might want to write to the store
-   at this point.  Or, you might use some other method.
-   Whatever you might choose, here's a hook point to implement it.
-
-   One item of note is that this delta is in addition to
-   any existing offset you might be already using. */
-
-    return;
-}
-
 static void rtc_set_time(RTCState *s)
 {
     struct tm *tm = &s->current_tm;
-    time_t before, after;
-    
-    before = mktime(tm);
+
     tm->tm_sec = from_bcd(s, s->cmos_data[RTC_SECONDS]);
     tm->tm_min = from_bcd(s, s->cmos_data[RTC_MINUTES]);
     tm->tm_hour = from_bcd(s, s->cmos_data[RTC_HOURS] & 0x7f);
@@ -210,12 +193,6 @@ static void rtc_set_time(RTCState *s)
     tm->tm_mday = from_bcd(s, s->cmos_data[RTC_DAY_OF_MONTH]);
     tm->tm_mon = from_bcd(s, s->cmos_data[RTC_MONTH]) - 1;
     tm->tm_year = from_bcd(s, s->cmos_data[RTC_YEAR]) + 100;
-
-    /* Compute, and send, the additional time delta
-       We could compute the total time delta, but this is
-       sufficient, and simple. */
-    after = mktime(tm);
-    send_timeoffset_msg(after-before);
 }
 
 static void rtc_copy_date(RTCState *s)
@@ -412,11 +389,9 @@ void rtc_set_date_from_host(RTCState *s)
     time_t ti;
     struct tm *tm;
     int val;
-    extern time_t timeoffset;
 
     /* set the CMOS date */
     time(&ti);
-    ti += timeoffset;
     if (rtc_utc)
         tm = gmtime(&ti);
     else

diff --git a/tools/ioemu/hw/pc.c b/tools/ioemu/hw/pc.c
index a43e866bc71979f5aab5144c3fd8f2a553454bde..1c33cdc8da4e3088eaf5c790030d70754010ed14 100644 (file)
--- a/tools/ioemu/hw/pc.c
+++ b/tools/ioemu/hw/pc.c
@@ -177,7 +177,7 @@ static int get_bios_disk(char *boot_device, int index) {
 }
 
 /* hd_table must contain 4 block drivers */
-static void cmos_init(uint64_t ram_size, char *boot_device, BlockDriverState **hd_table, time_t timeoffset)
+static void cmos_init(uint64_t ram_size, char *boot_device, BlockDriverState **hd_table)
 {
     RTCState *s = rtc_state;
     int val;
@@ -464,7 +464,7 @@ static void pc_init_ne2k_isa(NICInfo *nd)
 static void pc_init1(uint64_t ram_size, int vga_ram_size, char *boot_device,
                      DisplayState *ds, const char **fd_filename, int snapshot,
                      const char *kernel_filename, const char *kernel_cmdline,
-                     const char *initrd_filename, time_t timeoffset,
+                     const char *initrd_filename,
                      int pci_enabled)
 {
 #ifndef NOBIOS
@@ -741,7 +741,7 @@ static void pc_init1(uint64_t ram_size, int vga_ram_size, char *boot_device,
 
     floppy_controller = fdctrl_init(6, 2, 0, 0x3f0, fd_table);
 
-    cmos_init(ram_size, boot_device, bs_table, timeoffset);
+    cmos_init(ram_size, boot_device, bs_table);
 
     /* using PIIX4 acpi model */
     if (pci_enabled && acpi_enabled)
@@ -801,13 +801,12 @@ static void pc_init_pci(uint64_t ram_size, int vga_ram_size, char *boot_device,
                         int snapshot, 
                         const char *kernel_filename, 
                         const char *kernel_cmdline,
-                        const char *initrd_filename,
-                        time_t timeoffset)
+                        const char *initrd_filename)
 {
     pc_init1(ram_size, vga_ram_size, boot_device,
              ds, fd_filename, snapshot,
              kernel_filename, kernel_cmdline,
-             initrd_filename, timeoffset, 1);
+             initrd_filename, 1);
 }
 
 static void pc_init_isa(uint64_t ram_size, int vga_ram_size, char *boot_device,
@@ -815,13 +814,12 @@ static void pc_init_isa(uint64_t ram_size, int vga_ram_size, char *boot_device,
                         int snapshot, 
                         const char *kernel_filename, 
                         const char *kernel_cmdline,
-                        const char *initrd_filename,
-                        time_t timeoffset)
+                        const char *initrd_filename)
 {
     pc_init1(ram_size, vga_ram_size, boot_device,
              ds, fd_filename, snapshot,
              kernel_filename, kernel_cmdline,
-             initrd_filename, timeoffset, 0);
+             initrd_filename, 0);
 }
 
 QEMUMachine pc_machine = {

diff --git a/tools/ioemu/vl.c b/tools/ioemu/vl.c
index af9067eb51588c1f049dbbcecf3005c5ba10c061..75d49f5c00c2cc76d22e234498c2ab3800719efb 100644 (file)
--- a/tools/ioemu/vl.c
+++ b/tools/ioemu/vl.c
@@ -183,8 +183,6 @@ extern int vcpus;
 
 int xc_handle;
 
-time_t timeoffset = 0;
-
 char domain_name[1024] = { 'H','V', 'M', 'X', 'E', 'N', '-'};
 extern int domid;
 
@@ -6326,7 +6324,6 @@ void help(void)
           "-vnc display    start a VNC server on display\n"
            "-vncviewer      start a vncviewer process for this domain\n"
            "-vncunused      bind the VNC server to an unused port\n"
-           "-timeoffset     time offset (in seconds) from local time\n"
 #ifndef _WIN32
           "-daemonize      daemonize QEMU after initializing\n"
 #endif
@@ -6423,7 +6420,6 @@ enum {
     ,
     QEMU_OPTION_d,
     QEMU_OPTION_vcpus,
-    QEMU_OPTION_timeoffset,
     QEMU_OPTION_acpi,
     QEMU_OPTION_vncviewer,
     QEMU_OPTION_vncunused,
@@ -6523,7 +6519,6 @@ const QEMUOption qemu_options[] = {
     
     { "d", HAS_ARG, QEMU_OPTION_d },
     { "vcpus", 1, QEMU_OPTION_vcpus },
-    { "timeoffset", HAS_ARG, QEMU_OPTION_timeoffset },
     { "acpi", 0, QEMU_OPTION_acpi },
     { NULL },
 };
@@ -7468,9 +7463,6 @@ int main(int argc, char **argv)
                 vcpus = atoi(optarg);
                 fprintf(logfile, "qemu: the number of cpus is %d\n", vcpus);
                 break;
-            case QEMU_OPTION_timeoffset:
-                timeoffset = strtol(optarg, NULL, 0);
-                break;
             case QEMU_OPTION_acpi:
                 acpi_enabled = 1;
                 break;
@@ -7842,8 +7834,7 @@ int main(int argc, char **argv)
 
     machine->init(ram_size, vga_ram_size, boot_device,
                   ds, fd_filename, snapshot,
-                  kernel_filename, kernel_cmdline, initrd_filename,
-                  timeoffset);
+                  kernel_filename, kernel_cmdline, initrd_filename);
     free(boot_device);
 
     /* init USB devices */

diff --git a/tools/ioemu/vl.h b/tools/ioemu/vl.h
index 1d8a38372865cd701131fe725838941eaa8633a1..70b36f98fef1f819e2f0f5e6a0384e06a306de91 100644 (file)
--- a/tools/ioemu/vl.h
+++ b/tools/ioemu/vl.h
@@ -728,7 +728,7 @@ typedef void QEMUMachineInitFunc(uint64_t ram_size, int vga_ram_size,
                                  char *boot_device,
              DisplayState *ds, const char **fd_filename, int snapshot,
              const char *kernel_filename, const char *kernel_cmdline,
-             const char *initrd_filename, time_t timeoffset);
+             const char *initrd_filename);
 
 typedef struct QEMUMachine {
     const char *name;